29d588d82a9f326f17b1f7c95b7ab2f36a80f33d,javasrc/src/org/ccnx/ccn/impl/security/keys/BasicKeyManager.java,BasicKeyManager,publishKey,#ContentName#PublicKey#PublisherPublicKeyDigest#KeyLocator#,750

Before Change


			keyName = getDefaultKeyName(keyDigest);
		}
		Log.info("publishKey: publishing key {0} under specified key name {1}", keyToPublish, keyName);
		return _keyRepository.publishKey(keyName, keyToPublish, signingKeyID, signingKeyLocator);
	}

	/**

After Change


			keyName = getDefaultKeyName(keyDigest);
		}
		Log.info("publishKey: publishing key {0} under specified key name {1}", keyDigest, keyName);
		PublicKeyObject keyObject =  _keyRepository.publishKey(keyName, keyToPublish, signingKeyID, signingKeyLocator);
		
		if (!haveStoredKeyLocator(keyDigest) && (null != keyObject)) {
			// So once we publish self-signed key object, we store a pointer to that
			// to use. Don't override any manually specified values.
			KeyLocator newKeyLocator = new KeyLocator(keyObject.getVersionedName(), keyObject.getContentPublisher());
			setKeyLocator(keyDigest, newKeyLocator);
			Log.info("publishKey: storing key locator {1} for key {1}", keyDigest, newKeyLocator);
		}
		return keyObject;
	}

	/**